_STD -> _VSTD to avoid macro clash on windows git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134190 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/sstream b/include/sstream index 2a5fcc5..a2a0d31 100644 --- a/include/sstream +++ b/include/sstream
@@ -261,7 +261,7 @@ ptrdiff_t __nout = __rhs.pptr() - __rhs.pbase(); ptrdiff_t __eout = __rhs.epptr() - __rhs.pbase(); ptrdiff_t __hm = __rhs.__hm_ - __rhs.pbase(); - __str_ = _STD::move(__rhs.__str_); + __str_ = _VSTD::move(__rhs.__str_); char_type* __p = const_cast<char_type*>(__str_.data()); this->setg(__p, __p + __ninp, __p + __einp); this->setp(__p, __p + __eout); @@ -284,7 +284,7 @@ ptrdiff_t __eout = __rhs.epptr() - __rhs.pbase(); ptrdiff_t __hm = __rhs.__hm_ - __rhs.pbase(); __mode_ = __rhs.__mode_; - __str_ = _STD::move(__rhs.__str_); + __str_ = _VSTD::move(__rhs.__str_); char_type* __p = const_cast<char_type*>(__str_.data()); this->setg(__p, __p + __ninp, __p + __einp); this->setp(__p, __p + __eout); @@ -314,7 +314,7 @@ ptrdiff_t __lnout = this->pptr() - this->pbase(); ptrdiff_t __leout = this->epptr() - this->pbase(); ptrdiff_t __lhm = this->__hm_ - this->pbase(); - _STD::swap(__mode_, __rhs.__mode_); + _VSTD::swap(__mode_, __rhs.__mode_); __str_.swap(__rhs.__str_); char_type* __p = const_cast<char_type*>(__str_.data()); this->setg(__p, __p + __rninp, __p + __reinp); @@ -451,7 +451,7 @@ } #endif // _LIBCPP_NO_EXCEPTIONS } - __hm_ = _STD::max(this->pptr() + 1, __hm_); + __hm_ = _VSTD::max(this->pptr() + 1, __hm_); if (__mode_ & ios_base::in) { char_type* __p = const_cast<char_type*>(__str_.data()); @@ -582,8 +582,8 @@ template <class _CharT, class _Traits, class _Allocator> inline _LIBCPP_INLINE_VISIBILITY basic_istringstream<_CharT, _Traits, _Allocator>::basic_istringstream(basic_istringstream&& __rhs) - : basic_istream<_CharT, _Traits>(_STD::move(__rhs)), - __sb_(_STD::move(__rhs.__sb_)) + : basic_istream<_CharT, _Traits>(_VSTD::move(__rhs)), + __sb_(_VSTD::move(__rhs.__sb_)) { basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_); } @@ -592,8 +592,8 @@ basic_istringstream<_CharT, _Traits, _Allocator>& basic_istringstream<_CharT, _Traits, _Allocator>::operator=(basic_istringstream&& __rhs) { - basic_istream<char_type, traits_type>::operator=(_STD::move(__rhs)); - __sb_ = _STD::move(__rhs.__sb_); + basic_istream<char_type, traits_type>::operator=(_VSTD::move(__rhs)); + __sb_ = _VSTD::move(__rhs.__sb_); return *this; } @@ -701,8 +701,8 @@ template <class _CharT, class _Traits, class _Allocator> inline _LIBCPP_INLINE_VISIBILITY basic_ostringstream<_CharT, _Traits, _Allocator>::basic_ostringstream(basic_ostringstream&& __rhs) - : basic_ostream<_CharT, _Traits>(_STD::move(__rhs)), - __sb_(_STD::move(__rhs.__sb_)) + : basic_ostream<_CharT, _Traits>(_VSTD::move(__rhs)), + __sb_(_VSTD::move(__rhs.__sb_)) { basic_ostream<_CharT, _Traits>::set_rdbuf(&__sb_); } @@ -711,8 +711,8 @@ basic_ostringstream<_CharT, _Traits, _Allocator>& basic_ostringstream<_CharT, _Traits, _Allocator>::operator=(basic_ostringstream&& __rhs) { - basic_ostream<char_type, traits_type>::operator=(_STD::move(__rhs)); - __sb_ = _STD::move(__rhs.__sb_); + basic_ostream<char_type, traits_type>::operator=(_VSTD::move(__rhs)); + __sb_ = _VSTD::move(__rhs.__sb_); return *this; } @@ -820,8 +820,8 @@ template <class _CharT, class _Traits, class _Allocator> inline _LIBCPP_INLINE_VISIBILITY basic_stringstream<_CharT, _Traits, _Allocator>::basic_stringstream(basic_stringstream&& __rhs) - : basic_iostream<_CharT, _Traits>(_STD::move(__rhs)), - __sb_(_STD::move(__rhs.__sb_)) + : basic_iostream<_CharT, _Traits>(_VSTD::move(__rhs)), + __sb_(_VSTD::move(__rhs.__sb_)) { basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_); } @@ -830,8 +830,8 @@ basic_stringstream<_CharT, _Traits, _Allocator>& basic_stringstream<_CharT, _Traits, _Allocator>::operator=(basic_stringstream&& __rhs) { - basic_iostream<char_type, traits_type>::operator=(_STD::move(__rhs)); - __sb_ = _STD::move(__rhs.__sb_); + basic_iostream<char_type, traits_type>::operator=(_VSTD::move(__rhs)); + __sb_ = _VSTD::move(__rhs.__sb_); return *this; } 